calendar: Make final

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 32df686852f350da4b64f49f96c66b535cdda591..a34931852497c4d334d3234595db14c7f832a3c4 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -184,6 +184,29 @@ enum
 
 static guint gtk_calendar_signals[LAST_SIGNAL] = { 0 };
 
+typedef struct _GtkCalendarClass   GtkCalendarClass;
+typedef struct _GtkCalendarPrivate GtkCalendarPrivate;
+
+struct _GtkCalendar
+{
+  GtkWidget widget;
+
+  GtkCalendarPrivate *priv;
+};
+
+struct _GtkCalendarClass
+{
+  GtkWidgetClass parent_class;
+
+  void (* month_changed)                (GtkCalendar *calendar);
+  void (* day_selected)                 (GtkCalendar *calendar);
+  void (* day_selected_double_click)    (GtkCalendar *calendar);
+  void (* prev_month)                   (GtkCalendar *calendar);
+  void (* next_month)                   (GtkCalendar *calendar);
+  void (* prev_year)                    (GtkCalendar *calendar);
+  void (* next_year)                    (GtkCalendar *calendar);
+};
+
 struct _GtkCalendarPrivate
 {
   GtkCalendarDisplayOptions display_flags;

diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index bff8623b8707e381d01fb5347631401e19d4fb49..057d19ffed02a37fe75b2d25ee2d41f9d8b77ea7 100644 (file)
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -40,16 +40,10 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_CALENDAR                  (gtk_calendar_get_type ())
 #define GTK_CALENDAR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CALENDAR, GtkCalendar))
-#define GTK_CALENDAR_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CALENDAR, GtkCalendarClass))
 #define GTK_IS_CALENDAR(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CALENDAR))
-#define GTK_IS_CALENDAR_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CALENDAR))
-#define GTK_CALENDAR_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CALENDAR, GtkCalendarClass))
 
 
 typedef struct _GtkCalendar           GtkCalendar;
-typedef struct _GtkCalendarClass       GtkCalendarClass;
-
-typedef struct _GtkCalendarPrivate     GtkCalendarPrivate;
 
 /**
  * GtkCalendarDisplayOptions:
@@ -93,34 +87,6 @@ typedef gchar* (*GtkCalendarDetailFunc) (GtkCalendar *calendar,
                                          guint        day,
                                          gpointer     user_data);
 
-struct _GtkCalendar
-{
-  GtkWidget widget;
-
-  GtkCalendarPrivate *priv;
-};
-
-struct _GtkCalendarClass
-{
-  GtkWidgetClass parent_class;
-  
-  /* Signal handlers */
-  void (* month_changed)               (GtkCalendar *calendar);
-  void (* day_selected)                        (GtkCalendar *calendar);
-  void (* day_selected_double_click)   (GtkCalendar *calendar);
-  void (* prev_month)                  (GtkCalendar *calendar);
-  void (* next_month)                  (GtkCalendar *calendar);
-  void (* prev_year)                   (GtkCalendar *calendar);
-  void (* next_year)                   (GtkCalendar *calendar);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
 GDK_AVAILABLE_IN_ALL
 GType     gtk_calendar_get_type        (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL